f6f980905fb94f66460cf0bf4d89ec96cbfa94e5,src/edu/stanford/nlp/time/TimeExpressionExtractorImpl.java,TimeExpressionExtractorImpl,extractTimeExpressions,#CoreMap#String#,127
Before Change
}
}
// Some resolving is done even if docDate null...
if ( /*docDate != null && */ timeExpressions != null) {
resolveTimeExpressions(annotation, timeExpressions, docDate);
}
if (options.restrictToTimex3) {
// Keep only TIMEX3 compatible timeExpressions
List<TimeExpression> kept = new ArrayList<TimeExpression>(timeExpressions.size());
for (TimeExpression te:timeExpressions) {
if (te.getTemporal() != null && te.getTemporal().getTimexValue() != null) {
kept.add(te);
} else {
List<? extends CoreMap> children = te.getAnnotation().get(TimeExpression.ChildrenAnnotation.class);
if (children != null) {
for (CoreMap child:children) {
TimeExpression childTe = child.get(TimeExpression.Annotation.class);
if (childTe != null) {
resolveTimeExpression(annotation, childTe, docDate);
if (childTe.getTemporal() != null && childTe.getTemporal().getTimexValue() != null) {
kept.add(childTe);
}
}
}
}
}
}
timeExpressions = kept;
}
// Add back nested time expressions for ranges....
// For now only one level of nesting...
if (options.includeNested) {
List<TimeExpression> nestedTimeExpressions = new ArrayList<TimeExpression>();
for (TimeExpression te:timeExpressions) {
if (te.isIncludeNested()) {
List<? extends CoreMap> children = te.getAnnotation().get(TimeExpression.ChildrenAnnotation.class);
if (children != null) {
for (CoreMap child:children) {
TimeExpression childTe = child.get(TimeExpression.Annotation.class);
if (childTe != null) {
nestedTimeExpressions.add(childTe);
}
}
}
}
}
resolveTimeExpressions(annotation, nestedTimeExpressions, docDate);
timeExpressions.addAll(nestedTimeExpressions);
}
Collections.sort(timeExpressions, MatchedExpression.EXPR_TOKEN_OFFSETS_NESTED_FIRST_COMPARATOR);
// Some resolving is done even if docDate null...
if ( /*docDate != null && */ timeExpressions != null) {
resolveTimeExpressions(annotation, timeExpressions, docDate);
}
return timeExpressions;
}
After Change
}
// Some resolving is done even if docDate null...
// if ( /*docDate != null && */ timeExpressions != null) {
resolveTimeExpressions(annotation, timeExpressions, docDate);
// }
if (options.restrictToTimex3) {
// Keep only TIMEX3 compatible timeExpressions
List<TimeExpression> kept = new ArrayList<TimeExpression>(timeExpressions.size());
for (TimeExpression te:timeExpressions) {
if (te.getTemporal() != null && te.getTemporal().getTimexValue() != null) {
kept.add(te);
} else {
List<? extends CoreMap> children = te.getAnnotation().get(TimeExpression.ChildrenAnnotation.class);
if (children != null) {
for (CoreMap child:children) {
TimeExpression childTe = child.get(TimeExpression.Annotation.class);
if (childTe != null) {
resolveTimeExpression(annotation, childTe, docDate);
if (childTe.getTemporal() != null && childTe.getTemporal().getTimexValue() != null) {
kept.add(childTe);
}
}
}
}
}
}
timeExpressions = kept;
}
// Add back nested time expressions for ranges....
// For now only one level of nesting...
if (options.includeNested) {
List<TimeExpression> nestedTimeExpressions = new ArrayList<TimeExpression>();
for (TimeExpression te:timeExpressions) {
if (te.isIncludeNested()) {
List<? extends CoreMap> children = te.getAnnotation().get(TimeExpression.ChildrenAnnotation.class);
if (children != null) {
for (CoreMap child:children) {
TimeExpression childTe = child.get(TimeExpression.Annotation.class);
if (childTe != null) {
nestedTimeExpressions.add(childTe);
}
}
}
}
}
resolveTimeExpressions(annotation, nestedTimeExpressions, docDate);
timeExpressions.addAll(nestedTimeExpressions);
}
Collections.sort(timeExpressions, MatchedExpression.EXPR_TOKEN_OFFSETS_NESTED_FIRST_COMPARATOR);
// Some resolving is done even if docDate null...
// if ( /*docDate != null && */ timeExpressions != null) {
resolveTimeExpressions(annotation, timeExpressions, docDate);
// }
return timeExpressions;
}